tools: Introduce XEN_RUN_DIR path.

This patch also add libxl_run_dir_path() function in libxl.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Config.mk b/Config.mk
index 530ed3c37052f2c672bf35d6de9f40e6950b98c9..0c9607e9b32f1f49e1c9753cfa2790dff50f4936 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -133,6 +133,7 @@ define buildmakevars2file-closure
        echo "XEN_CONFIG_DIR=\"$(XEN_CONFIG_DIR)\"" >> $(1).tmp;           \
        echo "XEN_SCRIPT_DIR=\"$(XEN_SCRIPT_DIR)\"" >> $(1).tmp;           \
        echo "XEN_LOCK_DIR=\"$(XEN_LOCK_DIR)\"" >> $(1).tmp;               \
+       echo "XEN_RUN_DIR=\"$(XEN_RUN_DIR)\"" >> $(1).tmp;                 \
        if ! cmp $(1).tmp $(1); then mv -f $(1).tmp $(1); fi
 endef
 

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 25aeb4d819c7ccc621e8bfe06b386fac9a944c37..68fa22688434502a4353f5a777dfcbba670c27b5 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -52,9 +52,11 @@ PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
 ifeq ($(PREFIX),/usr)
 CONFIG_DIR = /etc
 XEN_LOCK_DIR = /var/lock
+XEN_RUN_DIR = /var/run/xen
 else
 CONFIG_DIR = $(PREFIX)/etc
 XEN_LOCK_DIR = $(PREFIX)/var/lock
+XEN_RUN_DIR = $(PREFIX)/var/run/xen
 endif
 
 SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 77724b3b778646085d7134face876f3d58295e40..bfe9c5886d75f67d021130b0bbb5ca480188d33c 100644 (file)
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -123,6 +123,7 @@ install: all
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
        $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
        $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)

diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index b8392b7fad0f2f36677f97381a7fa4fc3f57e724..da878e43b5ad0878d6817352d87556ea363b74e0 100644 (file)
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -529,6 +529,7 @@ const char *libxl_xenfirmwaredir_path(void);
 const char *libxl_xen_config_dir_path(void);
 const char *libxl_xen_script_dir_path(void);
 const char *libxl_lock_dir_path(void);
+const char *libxl_run_dir_path(void);
 
 #endif /* LIBXL_H */
 

diff --git a/tools/libxl/libxl_paths.c b/tools/libxl/libxl_paths.c
index 9c2bd060b9fd22db26650f7f4d026554f2b29526..192501f7ee0e069496b69413f21543c4ff8a1305 100644 (file)
--- a/tools/libxl/libxl_paths.c
+++ b/tools/libxl/libxl_paths.c
@@ -64,3 +64,8 @@ const char *libxl_lock_dir_path(void)
 {
     return XEN_LOCK_DIR;
 }
+
+const char *libxl_run_dir_path(void)
+{
+    return XEN_RUN_DIR;
+}